Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ba169ac authored by Tony Luck's avatar Tony Luck Committed by Linus Torvalds
Browse files

EDAC, sb_edac: Fix Knights Landing 



In commit 2c1ea4c7 ("EDAC, sb_edac: Use cpu family/model in driver
detection") I broke Knights Landing because I failed to notice that it
called a wrapper macro "sbridge_get_all_devices_knl" instead of
"sbridge_get_all_devices" like all the other types.

Now that we include the processor type in the pci_id_table structure we
can skip the wrappers and just have the sbridge_get_all_devices() check
the type to decide whether to allow duplicate devices and controllers to
have registers spread across buses.

Fixes: 2c1ea4c7 ("EDAC, sb_edac: Use cpu family/model in driver detection")
Tested-by: default avatarLukasz Odzioba <lukasz.odzioba@intel.com>
Acked-by: default avatarAristeu Rozanski <aris@redhat.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa3a9f57

drivers/edac/sb_edac.c

+6 −14
Original line number Diff line number Diff line
@@ -2378,22 +2378,19 @@ static int sbridge_get_onedevice(struct pci_dev **prev, 
 * @num_mc: pointer to the memory controllers count, to be incremented in case

 *	    of success.

 * @table: model specific table

 * @allow_dups: allow for multiple devices to exist with the same device id

 *              (as implemented, this isn't expected to work correctly in the

 *              multi-socket case).

 * @multi_bus: don't assume devices on different buses belong to different

 *             memory controllers.

 *

 * returns 0 in case of success or error code

 */

static int sbridge_get_all_devices_full(u8 *num_mc,

					const struct pci_id_table *table,

					int allow_dups,

					int multi_bus)

static int sbridge_get_all_devices(u8 *num_mc,

					const struct pci_id_table *table)

{

	int i, rc;

	struct pci_dev *pdev = NULL;

	int allow_dups = 0;

	int multi_bus = 0;



	if (table->type == KNIGHTS_LANDING)

		allow_dups = multi_bus = 1;

	while (table && table->descr) {

		for (i = 0; i < table->n_devs; i++) {

			if (!allow_dups || i == 0 ||
@@ -2420,11 +2417,6 @@ static int sbridge_get_all_devices_full(u8 *num_mc, 
	return 0;

}



#define sbridge_get_all_devices(num_mc, table) \

		sbridge_get_all_devices_full(num_mc, table, 0, 0)

#define sbridge_get_all_devices_knl(num_mc, table) \

		sbridge_get_all_devices_full(num_mc, table, 1, 1)



static int sbridge_mci_bind_devs(struct mem_ctl_info *mci,

				 struct sbridge_dev *sbridge_dev)

{